From 1f585151fd07c40fd1dd8600bc342f4db036bce9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Oct 2015 18:13:29 -0400 Subject: [PATCH] Load settings.ini from all data dirs An error in the loading function was making us load the file from the first data dir repeatedly, instead. https://bugzilla.gnome.org/show_bug.cgi?id=757377 --- gtk/gtksettings.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index e4e91fb095..11b11916a1 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -290,7 +290,6 @@ gtk_settings_init (GtkSettings *settings) guint i = 0; gchar *path; const gchar * const *config_dirs; - const gchar *config_dir; priv = gtk_settings_get_instance_private (settings); settings->priv = priv; @@ -340,9 +339,9 @@ gtk_settings_init (GtkSettings *settings) g_free (path); config_dirs = g_get_system_config_dirs (); - for (config_dir = *config_dirs; *config_dirs != NULL; config_dirs++) + for (i = 0; config_dirs[i] != NULL; i++) { - path = g_build_filename (config_dir, "gtk-3.0", "settings.ini", NULL); + path = g_build_filename (config_dirs[i], "gtk-3.0", "settings.ini", NULL); if (g_file_test (path, G_FILE_TEST_EXISTS)) gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT); g_free (path); -- 2.30.2